Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 20 Jul 2010 14:21:52 +0000 (14:21 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 20 Jul 2010 14:21:52 +0000 (14:21 +0000)
commiteddf20f49a2416bdb9a17bf96b2bf76092a49f39
treeaa33106a4ddff89649350c4dc19e671a0e453cd0
parentd92399e7739909cd9af04bb8b8b31698a47f5e29
parente220926494578e7f4c28559881f122bc87deed20
Merge from mainline.